From: Juergen Gross <jgross@suse.com>
Date: Fri, 25 Aug 2017 12:06:35 +0000 (+0200)
Subject: remove deprecated boot parameter gnttab_max_nr_frames
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1610
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=03cbbdbbb7896f11b91ab9d1c00dd9ffbfbfa7bc;p=xen.git

remove deprecated boot parameter gnttab_max_nr_frames

The boot parameter gnttab_max_nr_frames has been deprecated in Xen 4.5.
Remove it now.

Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index 36895aa549..fb3859ce8e 100644
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -40,13 +40,6 @@
 #include <xsm/xsm.h>
 #include <asm/flushtlb.h>
 
-/*
- * This option is deprecated, use gnttab_max_frames and
- * gnttab_max_maptrack_frames instead.
- */
-static unsigned int __initdata max_nr_grant_frames;
-integer_param("gnttab_max_nr_frames", max_nr_grant_frames);
-
 unsigned int __read_mostly max_grant_frames;
 integer_param("gnttab_max_frames", max_grant_frames);
 
@@ -3684,17 +3677,7 @@ static void gnttab_usage_print_all(unsigned char key)
 
 static int __init gnttab_usage_init(void)
 {
-    if ( max_nr_grant_frames )
-    {
-        printk(XENLOG_WARNING
-               "gnttab_max_nr_frames is deprecated, use gnttab_max_frames instead\n");
-        if ( !max_grant_frames )
-            max_grant_frames = max_nr_grant_frames;
-        BUILD_BUG_ON(DEFAULT_MAX_MAPTRACK_FRAMES < DEFAULT_MAX_NR_GRANT_FRAMES);
-        if ( !max_maptrack_frames )
-            max_maptrack_frames = max_nr_grant_frames *
-                (DEFAULT_MAX_MAPTRACK_FRAMES / DEFAULT_MAX_NR_GRANT_FRAMES);
-    }
+    BUILD_BUG_ON(DEFAULT_MAX_MAPTRACK_FRAMES < DEFAULT_MAX_NR_GRANT_FRAMES);
 
     if ( !max_grant_frames )
         max_grant_frames = DEFAULT_MAX_NR_GRANT_FRAMES;